Skip to content

Squash merge messages contain information about all commits by default. #35247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Squash merge messages contain information about all commits by default. #35247

wants to merge 9 commits into from
+55 −21

Conversation

hiifong
Copy link
Member

@hiifong hiifong commented Aug 11, 2025 •
edited
Loading

This behavior is basically the same as GitHub, except for the dividing line I added.

screenshot:

image image image image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 11, 2025
@github-actions github-actions bot added modifies/translation modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files modifies/migrations labels Aug 11, 2025
@hiifong hiifong closed this Aug 11, 2025
@hiifong hiifong reopened this Aug 11, 2025
lunny
lunny reviewed Aug 11, 2025
View reviewed changes
@lunny lunny added this to the 1.25.0 milestone Aug 11, 2025
@wxiaoguang
Copy link
Contributor

Please split preparePullViewReviewAndMerge into small functions, but not introduce a new preparePullViewSquashMergeMsg to call everywhere.

And it needs tests to cover the changed logic (although old code doesn't have enough tests, new code should have when the logic is complex)

@wxiaoguang
Copy link
Contributor

This part seems not right, Co-xxx should be at the end.

image

@hiifong
Copy link
Member Author

hiifong commented Aug 11, 2025

This part seems not right, Co-xxx should be at the end.

image

Done.

image

@hiifong
Copy link
Member Author

hiifong commented Aug 11, 2025

Let me spend some time researching how to add tests.

@silverwind
Copy link
Member

image

Style nit: there should be no empty line between such metadata lines.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lunny lunny lunny left review comments

Assignees
No one assigned
Labels
lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. modifies/go Pull requests that update Go code
Projects
None yet
Milestone
1.25.0
Development

Successfully merging this pull request may close these issues.
5 participants
@hiifong @wxiaoguang @silverwind @lunny @GiteaBot